Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:50:02 +0000 (02:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Dec 2011 10:50:02 +0000 (02:50 -0800)
commit9b67cd5b41a35f12c6bad1ad984faf44ea940920
treee5f9f1990429cb155efd349539121f15948ed0b3
parentfbba4800e2d36a43c9975a628bf60ba07e86e636
parent8cc8a5683e62b60f957049e9de6020c716e6a60a
Merge from trunk.